Extending wolfIP AMD FPGA example support for full wolfBoot demo by dgarske · Pull Request #137 · wolfSSL/wolfip

dgarske · 2026-06-16T21:27:37Z

AMD/Xilinx ZCU102: EL2 chain-load, SD-card OTA, and wolfBoot secure-boot demo

Extends the AMD/Xilinx wolfIP ports with wolfBoot chain-loading support, an on-device SD-card OTA update path for the ZCU102, and an end-to-end secure-boot + OTA demo.

What this does

Add EL2 chain-load support and ZC702 DDR layout to the AMD/Xilinx ports.
Add SD-card OTA update support to the ZCU102 wolfIP port.
Add a wolfBoot secure-boot + network OTA demo (src/port/amd/boards/zcu102/wolfboot-demo/): a self-contained walkthrough plus scripts that build wolfBoot for the ZynqMP SD config, sign the app v1/v2 (RSA-4096 / SHA3), assemble BOOT.BIN (FSBL + PMUFW + BL31 + wolfBoot), program an SD card, and apply a signed A/B firmware update fetched over TFTP.

The demo

Lives under the ZCU102 port as wolfboot-demo/ and is the secure-boot variant of the boot flow (FSBL -> PMUFW -> BL31 -> wolfBoot (EL2) -> signed app (EL2)), distinct from the port's stock FSBL -> app chain (bootgen/, flash_sd.sh). It builds the app in the parent directory with the OTA=1 EL=2 LAYOUT=ddr options added by this PR, and drives an external wolfBoot checkout (WOLFBOOT=, default ../wolfBoot) to sign the image and generate the boot image. The running app fetches a newer signed image over the network, writes it to the OFP_B SD partition, and resets; wolfBoot then verifies both slots and boots the higher version, rolling back if the update fails to verify.

What makes it notable: the app re-uses wolfBoot's own SD-host and disk drivers (sdhci.c, disk.c, gpt.c) compiled straight into the application via a small EL2 platform shim (sdhci_shim.c), so one driver serves both wolfBoot and the app with no runtime hand-off.

Files added:

build.sh - build wolfBoot + sign the app v1/v2 + assemble BOOT.BIN
partition-sd.sh / program-sd.sh - create the demo MBR layout and program a card
update.sh - stage the update image + trigger the OTA over the network
boot.bif.in - bootgen template for the wolfBoot chain
README.md - full walkthrough with expected console output

Dependencies

Companion wolfBoot support: ZynqMP ZCU102 SD-card Linux boot: EL2 handoff, SDHCI init, QSPI hardening wolfBoot#750 (ZCU102 SD-card boot config and drivers). wolfBoot stays an external dependency - it is not vendored here.
Toolchain: aarch64-none-elf- GCC and bootgen (Vitis) on PATH. FSBL/PMUFW/BL31 are board-specific (AMD prebuilts or a local Vitis/PetaLinux/ATF build).

Testing

Bare-metal port (EL3, OCM) and the EL2 DDR chain-load layout build and run on the ZCU102.
OTA path: app fetches a signed v2 image over TFTP, stages it to OFP_B, resets, and wolfBoot boots the higher version; a tampered image fails verification and the board stays on v1.
Demo scripts are shell-only helpers; bash -n clean and fail-fast on missing dependencies.

Copilot

Pull request overview

Extends the AMD/Xilinx bare-metal wolfIP examples to support a full wolfBoot demo flow: running at EL2 when chain-loaded by wolfBoot, adding a ZC702 DDR memory layout option, and enabling SD-card based OTA updates on ZCU102 via TFTP + wolfBoot’s disk/SDHCI drivers compiled into the app.

Changes:

Add Zynq-7000 DDR linker script + LAYOUT=ocm|ddr selection to improve ZC702 throughput and support wolfBoot load address.
Add ZCU102 EL=2|3 selection (EL2 chain-load support) and adjust AArch64 startup/MMU code for EL2 system registers.
Add ZCU102 OTA path (OTA=1) with SDHCI shim, newlib syscall stubs, and a TFTP-based update stager writing OFP_B then resetting.

Reviewed changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
`src/port/amd/README.md`	Updates performance table and loading notes reflecting ZC702 DDR support.
`src/port/amd/common/app.c`	Adds optional OTA trigger via UDP “UPDATE” and calls `ota_poll()` in main loop.
`src/port/amd/boards/zynq7000/target_ddr.ld`	New DDR-based linker layout aligned to wolfBoot load address.
`src/port/amd/boards/zynq7000/Makefile`	Adds `LAYOUT` selector and rebuild-stamp handling for layout switches.
`src/port/amd/boards/zcu102/syscalls_stub.c`	New minimal newlib syscall stubs for OTA builds pulling in `snprintf()`.
`src/port/amd/boards/zcu102/sdhci_shim.c`	New glue layer to reuse wolfBoot SDHCI/disk drivers inside the wolfIP app + reset hook.
`src/port/amd/boards/zcu102/ota.h`	Declares OTA trigger/poll API used by the common app.
`src/port/amd/boards/zcu102/ota.c`	Implements TFTP download → RAM staging → OFP_B write → reset sequencing.
`src/port/amd/boards/zcu102/Makefile`	Adds `EL` selector and `OTA=1` build path pulling in wolfBoot driver sources.
`src/port/amd/boards/zcu102/board.c`	Updates banner to reflect whether running at EL2 or EL3.
`src/port/amd/arch/armv7/mmu_armv7.c`	Carves DDR cacheability around DMA buffer region when DMA buffers live in DDR.
`src/port/amd/arch/aarch64/startup_aarch64.S`	Retargets EL-specific system registers for EL2 chain-loaded entry.
`src/port/amd/arch/aarch64/mmu_aarch64.c`	Retargets MMU control registers/TLB ops for EL2 vs EL3 builds.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 2 comments.

…kthrough

…ADME typo

Copilot

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated no new comments.

Suppressed comments (2)

src/port/amd/boards/zcu102/wolfboot-demo/build.sh:42

The demo build checks only for zynqmp_fsbl.elf, but bootgen also needs pmufw.elf and bl31.elf. If either is missing, the script will run further and then fail later with a less actionable error. Add explicit checks for all three firmware components up front.

[ -f "$FW/zynqmp_fsbl.elf" ] || { echo "ERROR: FSBL/PMUFW/BL31 not in $FW - build them (see README) and set FW=" >&2; exit 1; }

src/port/amd/boards/zcu102/syscalls_stub.c:96

_fstat() currently returns success even when passed a NULL stat pointer, which violates the usual newlib syscall contract and can make callers think the fd is valid when no data was written. Return -1 with errno=EINVAL when st is NULL (consistent with other ports’ syscalls.c).

    if (st != NULL)
        st->st_mode = S_IFCHR;
    return 0;

dgarske self-assigned this Jun 16, 2026

Copilot AI review requested due to automatic review settings June 16, 2026 21:27

Copilot started reviewing on behalf of dgarske June 16, 2026 21:28 View session

Copilot AI reviewed Jun 16, 2026

View reviewed changes

Comment thread src/port/amd/boards/zcu102/ota.c

Comment thread src/port/amd/boards/zcu102/syscalls_stub.c

Comment thread src/port/amd/boards/zcu102/Makefile Outdated

Comment thread src/port/amd/boards/zcu102/Makefile

Comment thread src/port/amd/boards/zynq7000/Makefile Outdated

dgarske requested a review from Copilot June 17, 2026 17:00

Copilot started reviewing on behalf of dgarske June 17, 2026 17:01 View session

Copilot AI reviewed Jun 17, 2026

View reviewed changes

Comment thread src/port/amd/boards/zcu102/syscalls_stub.c Outdated

dgarske requested a review from Copilot July 8, 2026 23:07

Copilot started reviewing on behalf of dgarske July 8, 2026 23:07 View session

Copilot AI reviewed Jul 8, 2026

View reviewed changes

Comment thread src/port/amd/boards/zcu102/Makefile

dgarske requested a review from Copilot July 9, 2026 23:00

Copilot started reviewing on behalf of dgarske July 9, 2026 23:01 View session

Copilot AI reviewed Jul 9, 2026

View reviewed changes

Comment thread src/port/amd/arch/aarch64/startup_aarch64.S Outdated

Comment thread src/port/amd/arch/aarch64/startup_aarch64.S Outdated

dgarske added 6 commits August 6, 2026 21:51

Add EL2 chain-load support and ZC702 DDR layout to the AMD/Xilinx ports

0bcf62e

Add SD-card OTA update support to the ZCU102 wolfIP port

72d21ad

Address peer review: OTA retry state, stddef include, Makefile guards

23286e9

zcu102: align OTA static heap to 16 bytes for AArch64 malloc

24594da

zcu102: add wolfBoot secure-boot and network OTA demo scripts and wal…

237f964

…kthrough

zcu102: address Copilot review - EL-generic exception comments and RE…

42698fa

…ADME typo

dgarske force-pushed the amd_wolfboot_ota branch from 2001571 to 42698fa Compare August 7, 2026 04:51

dgarske marked this pull request as ready for review August 7, 2026 04:51

dgarske requested a lite review from Copilot August 7, 2026 04:51

Copilot started reviewing on behalf of dgarske August 7, 2026 04:55 View session

Copilot AI reviewed Aug 7, 2026

View reviewed changes

Navigation Menu

Uh oh!

Extending wolfIP AMD FPGA example support for full wolfBoot demo - #137

Extending wolfIP AMD FPGA example support for full wolfBoot demo#137
dgarske wants to merge 6 commits into
wolfSSL:masterfrom
dgarske:amd_wolfboot_ota

dgarske commented Jun 16, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

dgarske commented Jun 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

AMD/Xilinx ZCU102: EL2 chain-load, SD-card OTA, and wolfBoot secure-boot demo

What this does

The demo

Dependencies

Testing

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

dgarske commented Jun 16, 2026 •

edited

Loading